fixed #6
Merge branch 'bugfix/#6'