Merge pull request #10 from daveesposito/master

Sync Master
Merge pull request #11 from daveesposito/develop

Merge pull request #10 from daveesposito/master