missed files from previous push
Merge branch 'master' of https://github.com/IVPR/Weave