hassan second commit
Merge pull request #1 from mellowonpsx/hasan_branch

hassan second commit
Merge pull request #2 from mellowonpsx/master

eugen_branch 1st push