final changes
Merge pull request #19 from niquecoryell/master

final changes