Patch for issue #169 to fix compilation with Scala 2.11
Merge pull request #172 from Craigacp/master

Patch for issue #169 to fix compilation with Scala 2.11