Fixed issue #17 #18 #8 #14