Merge remote branch 'github/pr/175'

This closes #175

Signed-off-by: Eric Avdey <eiri@eiri.ca>