forgot to push changes in different branch... so this one is for the pull request only

the actual changes are in the last commit on master