Merge pull request #8 from wrathematics/master

regular updates
Merge pull request #9 from wrathematics/master

regular update
Merge pull request #10 from wrathematics/master

update
Merge pull request #11 from wrathematics/master

update
Merge pull request #12 from wrathematics/master

update
Merge pull request #13 from wrathematics/master

update
Merge pull request #14 from wrathematics/master

update
Merge pull request #15 from wrathematics/master

update
Merge pull request #16 from wrathematics/master

update
update
Merge pull request #5 from snoweye/master

add a few things