All pull requests merged

This includes both "improved tool handling"  and "webm restrictions enforcement" branches (pull requests #5 and #6).