Small bugfixing
Fix version: 05.02.002 (31.03.2014)
Merge branch 'master' into test-FAN
Small test correction