Merge pull request #920 from leprechau/small_updates