Minor refactoring
Merge pull request #57 from 28msec/ci

Minor refactoring