firs commit
Merge github.com:maliksatrio/maliksatrio