Merge branch 'milestone'
Version changed, readme updated
Merge branch 'master' into milestone