Merge pull request #1 from geraldfletcher/master

just testing 1