Resolve #13 and #14