current
Merge remote-tracking branch 'upstream/master'
Merge pull request #14 from epace/master

no conflicts