Merge pull request #106 from bitol-io/dev