add credits
add error_msg catcher
Merge remote-tracking branch 'origin/master'