Merge pull request #9 from buddytex/master

Resolve Issue #7