Updates and refactoring, read comment
Merge pull request #78 from exside/master

Updates and refactoring, read comment