* fixed #129: now shows a properly error message
Merge remote branch 'upstream/master'