stability fixes
Merge pull request #80 from secretrobotron/master

stability fixes