michelson Merge pull request #21 from michelson/naming-conventions