initial setup
Merge pull request #1 from jasonwhlaw/master

initial setup