Change parameters
Merge branch 'master' of github.com:mparodi/AE