Merge pull request #53 from mhuerster/master

bug fix