stability improvements
Merge pull request #8 from madprogger/develop

stability improvements