Merge pull request #215 from bitol-io/dev