merge from origin
Merge branch 'master' into visafunk
Merge pull request #2 from oos-dn-galan/visafunk

Visafunk