Reorganised some code
Merge branch 'master' of http://github.com/irxess/RNG-Shrine