Updated to support Machina's factory method
Bumped version to 0.1.1