change package definition
Merge branch 'development' of github.com:s-case/s-case into development
code review and format