no more hackers!
Merge pull request #84 from vladpupaza/daniel.panc/bugs

no more hackers!