fixed a bug
fixed more bugs
Merge pull request #31 from EnderShadow/master

fixed a bug