fixed double counting issue
Merge branch 'master' of github.com:adnorth/3x4