closes #25
addresses #5
addresses #6
Merge pull request #32 from KirbyAu2/drewman

closes #25
Merge conflict