Final fixes for version 1.0 :cocktail: