generalized a data structure
Merge branch 'develop' of github.com:Sable/heros into develop