Version 2.0 - Fully working!