Merge branch 'develop'
fixed twitter link in readme
Merge branch 'master' into develop