Updated splash again
Fixed a small issue
Merge remote-tracking branch 'origin/aside'