Bug fixes.
Merge branch 'master' of github.com:jyzackoh/splash
Bug fixes.