Cleanup. Maintaining v0.10.3 support for now
Added Vincent Siliakus