Implement #60 features

CC: #60