Preparing for further pull request

Preparing branch for pull request  from tkojdecki fork.