Merge pull request #71 from mancdaz/master

Merged automatically by jenkins after successful build test
Merge pull request #72 from mancdaz/master

Merged automatically by jenkins after successful build test
allow for external-vips