Fixes #39
merging in master