Merge pull request #1 from webRunes/master

Merge