Merge pull request #8 from nicklynchjonely/master

Pull new
Merge pull request #31 from ccarmen/master

Merge pull request #8 from nicklynchjonely/master