Merge pull request #9 from kedromelon/Will_develop

Will develop
Merge branch 'master' into Will_develop