First version
Clean, renamed and rebuilded
Merge pull request #1 from webRunes/master

Merge