Merge pull request #8 from dataplayer/master

nic's latest
Merge pull request #5 from Meglet/master

pull this again