Resolving conflicts
Merge branch 'addianto-master'