Update to latest codebase
Merge pull request #1 from tpmma/master

Update