Merge pull request #4 from Alsuki/master

pull dos ultimos commits