fixed package name and changed randomizers to use HashMaps instead of Arrays
Merge remote-tracking branch 'origin/dev' into dev