Merge pull request #1 from HeisenBugDev/develop

Info writter
Merge pull request #2 from HeisenBugDev/develop

Bug Fixes
Merge branch 'master' into develop