Fixes for #105.
Merge pull request #106 from dinhviethoa/104-behavior-on-launch-bis

Fixes for #105.