Folis/gjms — pull request #6 by HmmmQuestionMark (2014-03-09 21:02:01+00:00)
Title: A few fixes.

I accidentally removed a few important changes @Folis made.