Revert Merge pull request #8 from tomasdev/master