Minor bugs fixed
Merge pull request #294 from shinesoftware/sandbox

Minor bugs fixed