updated with scala 2.11