#71 Refactoring
Merge pull request #92 from id774/issue71

#71 Refactoring