rearranged elements
Merge pull request #24 from ajstanley/master

rearranged elements