Merge pull request #124 from bitol-io/dev