Simplify data structure to be more efficient
0.9.1
Merge pull request #80 from AHPWN/dev

v0.9.1