Merge pull request #1 from tp9/master

First commit