New features & bug fixes
Merge pull request #131 from caseyjhol/master

New features & bug fixes