initial commit
Merge pull request #1 from nrferguson/master

initial commit