merged actual master and ichim-david fork

merged #1 with actual master