Merge pull request #39 from ByteBlast/master

Beginnings of #25.
Resolves #40.