Merge pull request #7 from 90arther/develop

master  merge into develop