made a change
made other changes
[issue 53]
fixed test problem
finished [issue 53]
Merge branch 'iss53'
testing