Merge pull request #6 from dataplayer/master

pushing everything I have
Merge pull request #3 from Meglet/master

just a pull request