minor bug fixes also in Christmas time!
Merge pull request #317 from shinesoftware/sandbox

minor bug fixes also in Christmas time!