Merge pull request #3 from mrbyte2001/master

Merge 0.8