Merge pull request #1 from stanseuruk/master

sa
andrei
asd added