v1.0.5 - Untested