Closes #12.

Finally merged!