Merge pull request #84 from pakozm/pako-devel

Changed convolution implementation to work properly but less efficient
Merge branch 'pako-devel' into devel
Merge branch 'pako-devel' into devel
Merge branch 'pako-devel' into devel
Merge branch 'devel' into pako-devel