Merge pull request #586 from lynxis/nodogsplash