fixes
#36
#37
small fixes
#40
release 0.64