Merge pull request #1 from wrathematics/master

Get another updates
allocation bug fixed
Merge pull request #2 from snoweye/master

-~*oopsies*~-