Merge pull request #6 from drs1/smittydev

Merge pull request #5 from drs1/master