shoby's push 2
Merge pull request #18 from calvinbulger/master

shoby's push 2