Followed the coding style
Merge branch 'dev'

Now, default development branch is master