Updated to 1.6.4 and fixed issues

Fixed #1, #15, #17, #18, #19, #23, #24, #25, #26