Merge pull request #8 from hmurray/feature

changed y in feature
added z
removed z
changed x in develop:
changed x in feature