Version 2.1, commit 38

Bug fixes