Merge pull request #2 from akbargumbira/master

Some tweakings
Merge pull request #3 from akbargumbira/master

Some tweakings
Updated some resources.