fix all bugs
Merge pull request #1 from hiddensanctum/master

fix all bugs