Changes made after the revert, on the feature_branch
merge the mess
Merge pull request #2 from szanto90balazs/feature_branch

Changes made after the revert, on the feature_branch