Fixed #15

Closes #16