Small changes, made it operational but contains count error
Merge branch 'master' of https://github.com/dsnet/idiomatic