Merge pull request #1 from szanto90balazs/feature_branch

some cool new features on different branch
commit the revert
merge the mess