Merge pull request #1 from neowinx/develop

Develop
Merge pull request #2 from neowinx/develop

Develop
Update README.md
Merge pull request #3 from neowinx/master

Update develop with master changes