Added proper except catching, fixed docstrings, changed double underscore args to single underscore
Merge remote-tracking branch 'origin/master'