Version 1.0.0 - Finally working!