refactoring
Merge pull request #15 from shwld/holderorroot_bugfix

refactoring