Fixes #50
Fixes #55
Merge branch 'refs/heads/develop'