initial commit
Merge branch 'master'
Merge pull request #1 from dansamargiu/local

Local