Fix for #115
Fix for #122
bumped version
Made stop functionality public, fix for #120
fix merge conflict