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

Minor bugs fixed