Fixed an old issue.
should fix #39
actualy fixes #39
fixes #40
Merge branch 'master'