Merge pull request #179 from benjello/dev

Minor bugs and psa