Update

Bug Fixes, tidy up and compatibility with WordPress 4