Merge pull request #1 from silentsword/master

another
Merge pull request #3 from Chinta/master

Merge pull request #1 from silentsword/master