sync from master
Merge pull request #1 from carmines/dev

sync from master