some bugs fixed
Merge pull request #5 from thedrumsknight/master

some bugs fixed