Merge pull request #25 from brentthorne/master

Cath up dev to master to set up working from there