copy from skeleton
Merge pull request #65 from tsutro/master

Tim Sutro