Issues #9 && #10 resolved