this is crisus commit
rezolved conflicts
Merge pull request #2 from crissu/crisu_branch

this is crisus commit