copy from skeleton
Merge pull request #52 from twsanders/master

Thomas Sanders