Proper README
Merge branch 'develop'