Official version 1.0

Master should be up to date with current version.