Add failing test
Code refactoring and bug fixes
Code refactoring
Bug fixes
Code refactoring
Code refactoring
Code refactoring
Update watch version
Merge pull request #56 from 28msec/0.5.4

Bug fix