adding info
Merge https://github.com/jpazarzis/development