Commit of the Tony Morris Scala.Option problems