Merge pull request #8 from snoweye/master

merge
06.05.13 lots of small edits
Merge pull request #22 from wrathematics/master

update