Add new test
Code refactoring
Code refactoring
Merge pull request #53 from 28msec/0.5.2

Refactoring & bug fix