Merge pull request #62 from mhuerster/master

more bug handling