Merge pull request #48 from agundy/master

Pulling fast updates from master into dev