Closes#63