fixed minor bugs
Merge pull request #235 from shinesoftware/sandbox

fixed minor bugs