Merge remote-tracking branch 'origin/master'
[Ronald,Andrei] fix bug #1 (ugly solution we're afraid)