v4.2

Bug fixes, version control