This squash should work now.
Merge pull request #630 from Bahkuh/master

Minor improvements