Merge pull request #12 from sinagaboni/master

Merge pull request #32 from adheyulindasuherman/master
Merge pull request #33 from adheyulindasuherman/master

Merge pull request #12 from sinagaboni/master