removed word percent
changed a docstring a little
Merge branch 'aaron-dev'