added scala stuffs (dwyatt)