Merge pull request #7 from nobitis/develop

Develop
update info