Merge pull request ktaranov#126 from nedotter/master

Various cosmetic fixes, and also now only display natively compiled m…

Author: ktaranov