Merge branch 'develop'
updated readme to reflect 2 versions