Fixed issues #102 and #103