stuff
Merge pull request #4 from sparksm/master

stuff