First commit including custom fixes to the 1.0.0 release