Merge pull request #1 from JakubSuchecki/devel

Merging devel into master
adding exp
Merge branch 'master' into exp (before merging exp into master)
Merge branch 'devel' into master
adding devel 3
Merge branch 'master' into devel