fix random not working, improved performance
Merge branch 'master-namespace' of git://github.com/Evaneos/berthe into master-namespace