Removed default key to make sure users input their own.
Merge branch '1.0'
Merge branch 'master' into 1.1