This branch adds two features to the existing convolutions:
@lplatz, @mawandro, please give this a try!
This will create a new commit in order to revert the existing changes.