Merge pull request #2 from mono/develop

Merge latest dev changes