Merge pull request #84 from Gaerzi/master

Sync with my fork.