Merge pull request #79 from alexmckenley/dev

small bugfixed