Merge pull request #2 from cordoval/issue-145-for-dantleech

cs improvements
some-bit-more