Merge pull request #26 from DevenSmith/master

steve
newmaster