Version 1.1 - Incorported suggestions by Ghaleb and Rish