Merge pull request #7 from hmurray/feature

{ticket number}
added y
changed y
changed y in feature