Merge pull request #2 from mtrubs/master

take it.
Merge remote-tracking branch 'steve/master'