copy from skeleton
Merge pull request #24 from jmrobinson/master

James Robinson