Merge pull request #1 from daffy-da-fl00/master

Rebase 1.0