Fixed issue #6
Merge branch 'data-structure' into develop