avoid error handler
lowercase options
Merge remote-tracking branch 'upstream/master'
11.7.2014
Merge pull request #199 from sbillard/master

11.7.2014