Added support for scala 2.11