Merge pull request #92 from bitol-io/dev