Merge pull request #17 from EnderShadow/master

fixed a bug
4.0 RC3
Merge pull request #11 from vaendryl/master

update to RC3