apikey moved to properties, changed methods order to enhance readibility, minor changes
Merge remote-tracking branch 'origin/master'