Resolved issue 8
Built and tested; not sure which files should be .gitignored
Merge branch '8'
Merged 8 in