Merge branch 'master' into dev
Merge pull request #7 from code4sac/dev

Merge branch 'master' into dev