Merge pull request #4 from majikthys/master

Hipaa and rehack!