Update

Update 2.0
Merge pull request #1 from adistyawan/master

Update 2