Fixed github #14, #12