Fix
Merge https://github.com/eSdzeJ/POC6

Conflicts:
	.gitignore
Merge https://github.com/eSdzeJ/POC6

Conflicts:
	.gitignore

Signed-off-by: eSdzeJ <mr.akra@gmail.com>