Are you checking the #97 branch ?  it is unrelated this branch includes the 2 issues