Merge pull request #1 from ndhoule/master

Initial boilerplate commit