Changed regex
Added scaladoc generation