continue to move forward
continue to move forward
issue #26 fixed, code cleanup