Improve the detection of AttributeError in the console
Merge commits from master to st2 branch
Merge pull request #51 from Starli0n/st2

Merge commits from master to st2 branch