bug fixed and readme updated
Merge branch 'master' into dev