Closes: #265