Merge pull request #3 from mattdvhope/mod2

Pull request to merge mod2 with master.
changes