Issue 109 fixed