implemented comma/dot handling fixes #15