Improved error handling. Started crude method list.
Merge remote-tracking branch 'origin/master'