Fixed issues #33 and #35