Merge pull request #22 from wrathematics/master

update
Merge pull request #23 from wrathematics/master

update
Merge pull request #24 from wrathematics/master

update
update
update
update
update
update
update
update
update
update
update
update
Merge pull request #9 from snoweye/master

Merge