Fixed #14, Fixed #13