bug fix
Merge pull request #16 from foska/master

bug fix