Merge scala210 port started by Pavel Minchenkov
(closes #1)