A few more tweaks to scala port
Merge pull request #13 from rorygraves/master

A few more tweaks to scala port