Various tweakings.
Merge pull request #10 from akbargumbira/develop

Various tweakings.