Merge pull request #1 from fantabel/master

Bug