Merge pull request #93 from bitol-io/dev