Version 1.1 - added missing features