Merge pull request #56 from sbyx/revert-46-master