Update for Scala 2.11
Merge pull request #116 from takezoe/scala_2.10

Update for Scala 2.11