Moved to scala 2.11