Merge pull request #39 from kevingy/master

Pull request accepted - thanks!
Merge remote-tracking branch 'upstream/master'