Added features - see Issues #7 & #8