Some changes
Merge pull request #1 from bhanks/pulltest

Pull request merged.