Merge dev branch
Merged dev branch
Merge branch 'dev'
moved api description to wiki
Merge readme changes from master into dev