bug fixes
Merge pull request #7 from dVelopment/master

bug fixes