copy from skeleton
Merge pull request #26 from nsbrasco/master

Nicholas Brasco