Merge pull request #398 from xor-gate/refactoring