Issue #13 completed, fixed bug.