discarded branch '1.0', changed 'master' version to 1.0-pre