#556 Fixed
Merge branch 'nuno'