More work
Merge pull request #2 from bhardin/master

New Stuff