Eclipse support
Too many string concatenations when building error messages
Merge branch 'pull-request-51'