Closes #7
Fixed #21