Merge pull request #35 from Mayho/master

UI stuff