Merge pull request #2 from lebarsfa/master

First pull request.