changes to order
Merge pull request #4 from cartmen180/workingversion

changes to order