Added sth from laptop
Merge pull request #1 from vasouv/laptop_branch

Added sth from laptop