Merge pull request #8 from jv217/master

Made some changes