v1.0.4 - Refactore, cleanup, etc