First pull request against Develop!

Fixes for issues:
#374
#368