first commit by sar
another commit
Merge pull request #1 from saridimi/master

Some changes