bugfix
Merge pull request #94 from andhieka/working

bugfix