Merge pull request #1 from seejayi/master

[*]first commit