Fixes #39
Fixes #35
Merge origin/master