bugfix
Merge pull request #12 from kimisera/master

bugfix