edwinmoss Merge pull request #3 from Undev/master