Fixed issue #37 - include order is improved.
Merge branch 'issue-37' into develop