Merge pull request #57 from mhuerster/master

fix the bug fix