Merge remote branch 'github/pr/32'

This closes #32

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