#17 version 0.4.0 hotfixes