Code reordered
Merge pull request #86 from rampo/develop

Code reordered