Merge pull request #3 from WebRuin/master

Master