Merge pull request #31 from narner/master

Getting started edits