merge PR #2 from nyamsprod-master