Implement #28. Closed #28