Version 2.2

Bug fixes and small additions