Fix syntax error
Fix name error
Merge pull request #9 from bmng-dev/merge

Merge branch merge into Random