Merge pull request #1 from tungu/local_tungu

Local tungu
Merge branch 'origin/master'