Closes: #14

This PR closes: #14