Merge pull request #159 from trevorbernard/master

Various improvements
Fix mislabeling issue