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

Pull to 1.0
Merge pull request #2 from daffy-da-fl00/1.0

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