scala udpates
Merge branch 'master' of github.com:faryeblazonco/scala