fixed message for compilation problem and proper factory init
Merge remote-tracking branch 'origin/master'