Merge pull request #12 from cviebrock/master

Merge branch 'release/1.0.4'
Merge pull request #13 from cviebrock/develop

Merge pull request #12 from cviebrock/master