Merge pull request #2 from epmatsw/master

Better Performance on Counting
Code cleanup

Included a bit more whitespace and removed the newline at the end of the
file.