ssefick Merge pull request #5 from mcastronova/patch-6