Merge pull request #4 from mikepaisner/Issue000005

More stuff for issue000005
Merge pull request #5 from mikepaisner/Issue000005

Rework for issue000005