first time committing
Merge pull request #38 from pdchung/master

making sure this works