reorder and add
Merge pull request #2 from ringogirl/manual

Please merge