Merge pull request #6 from aried3r/master