Grimley517 issue11

This will be merged back into issue #1 if it works.  This branch relates to issue #1