General code cleanup
v1.1.0 will add additional advanced features: Custom Patterns Step Attribute Key Value