Version 1.5

Bug fixes
Merge