Had to add these cases to get it to work on my scala installa 
Somebody with better scala mojo should confirm it's correct