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

some-bit-more
some more sorry
cs ftw