Round 1
Merge pull request #9 from crutch/master

Round 1