Updated to use sax-machine 0.2.1