My first PR merge

Working implementation for issue #531