Merge pull request #37 from lentillog/feature/remove-hack