Revert "Merge from master."
Merge pull request #3 from tibor-mirnic/revert-2-ext5

Revert "Merge from master."