copy from skeleton
Merge pull request #17 from nlanglo1/master

nlanglo1