Merge pull request #194 from jpav/master

Fixes #177
Fixes #169