Merge pull request #48 from agundy/master

Pulling fast updates from master into dev
Merge pull request #49 from agundy/develop

Merge pull request #48 from agundy/master