Version 1.1.1

Bug fixes & tidying code