WOOHOO
Merge branch 'aws' of https://github.com/IVPR/Weave.git into aws