Major fixes :)
added variations
Refined disabled states
Merge branch 'release/1.0.1'