typo fix
Merge branch 'addfeatures' into testing