Merge remote branch 'github/pr/169'

This closes #169

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