Merge branch 'cgfrost-master'

[resolves #58]