Hello @jnettik @pixelwhip
I have fixed some issue mentioned in the PR.