Merged branch from Adekker. Added Thanks to Ade in About box.