Merge pull request #2 from naunga/master