digistump Merge pull request #15 from jdcockrill/master
99acfdd Jul 18, 2014
Merge pull request #15 from jdcockrill/master 
Multiple bug-fixes, primarily for stability
99acfdd