Merge pull request #1 from shogun42/developer

Developer
Merge branch 'master' into developer