Merge pull request #62 from Gaerzi/master

Sync with my fork.