Merge remote-tracking branch 'andy/master'

This closes #8