Committing 1.2
Merge pull request #4 from sethlilly/1.2

Committing 1.2