Revert "Merge from master."
Merge pull request #5 from tibor-mirnic/revert-4-master

Revert "Merge from master."