Merge pull request #34 from yakky/develop

Pre release updates