Incorporated changes reccomended by James Page @ Canonical