merge from https://github.com/zdunex25