Fix for bug 406

Fix for bug 406
Merge branch 'master' into feature-MAX-2