Nightly push to dev from work
Merge pull request #1 from ad-te/dev

Nightly push to dev from work