Merge branch '3.0' of https://github.com/hezamu/scaladin into 3.0
Merge branch '3.0' of https://github.com/hezamu/scaladin into 3.0