angga changes
Merge pull request #5 from indotek68/master

Merging Angga's changes