added changes
Merge pull request #20 from Brianified/master

added changes