Merge pull request #1 from srdee/master

Initial commit