antaldaniel Merge pull request #5 from antaldaniel/master