Merge pull request #134 from bitol-io/dev