Merge pull request #8 from nicklynchjonely/master

Pull new