Resolves #17. Only need some further testing before I can officially tag version 0.2.