fixes for datatypes reported in #11

fixed #11