Corrected implicit error message
Updated documentation
Merge branch 'master' into scala-2.11