Almost done, except the hard one.
It works, needed a better test.
Fix for #955
Pep8
Merge remote-tracking branch 'origin/develop' into fix_955
Tim's review.
s/msg/message
Another Tim's review.
Akbar's review.
Tim's Review.
Merge remote-tracking branch 'origin/develop' into fix_955
Merge pull request #972 from ismailsunni/fix_955

Fix 955
Tested under Ubuntu 12.04