Merge branch 'master' into development
Update readme and remove a query issue
Merge branch 'development'