Merge pull request #8 from quiris11/master