first commit
manual-merged pull request from iekpelu91