Basic changes to support issue 5
Merge pull request #7 from brucekeats/issue5

Basic changes to support issue 5