Setup data fixed
Minor bug fixed
Merge pull request #307 from shinesoftware/sandbox

Sandbox