Fixed functions
Changed namespace
Merge pull request #85 from SecretD/master

Fixed functions