At last some code
Merge remote-tracking branch 'upstream/master'
Merge pull request #3 from shearichard/master

Added some code