Merge pull request #401 from mwarning/nodogsplash2