Fixed Marquee issue with restarting

Fixed Marquee issue with restarting.
Merge pull request #178 from LiamKenyon/master

Fixed Marquee issue with restarting
Merge pull request #176 from scardenas/master

Solution for metrotab re-ordering (as suggested by meese)
Merge pull request #1 from viperneo/master

test