Merge pull request #3 from fofosudarko/develop

Restore original dev files
general fixes
general fixes
Merge branch 'master' into develop