address and order
Merge pull request #9 from mamie42/master

address and order
Merge pull request #1 from lustyangel/master

Update