merge original repo with digITpro`s work