shoby's push 1
Merge pull request #17 from calvinbulger/master

shoby's push 1