Merge pull request #67 from Gaerzi/master

Sync with my fork.