Fixed #14 Fixed #5