Fixed Issues #99 and #100