Merge pull request #4 from snoweye/master

a few update
02.21.13 nightly
Merge pull request #8 from wrathematics/master

regular updates