Merge pull request #1 from silentsword/master

another