Merge pull request #1 from unclebob/master

rebase