Fix Bug #348
Merge branch 'master' of https://github.com/IVPR/Weave