Merge pull request #1 from haka-security/develop

10/6/2014 update