#556 Fixed
Merge branch 'nuno'
Merge branch 'master' into apiv2