Merge pull request #1 from sandym/master

3 additions
Merge remote-tracking branch 'upstream/master'