Fixes issue #37
Merge branch 'master' of https://github.com/Kintaro/wtftw