Fixed Issues #66 and #102