updated
Merge branch 'Dev2' of https://github.com/cgunarto/CAPSL into Dev2