Issue 205 fixed
Cleaning up after fixing issue 205