Merge branch 'scala210-port'

Thanks to Pavel Minchenkov who started the port
(closes #1)