merge cosinuz

fix #4