Bug fixes, added #stop and #start
Release 0.1.1