Merge pull request #8 from trevorbernard/master

Various improvements