Resolved issue 6

Some work on 7
Merge pull request #8 from MikeMillerGIS/master

Resolved issue 6