closed #14, #132