Merge pull request #25 from rseanhall/master

WIP 4505