Merge pull request #66 from lynxis/upstream_nodogsplash