Merge pull request #15 from EmilSayahi/master

Updated nightly branch to sync with Master branch.
Merge pull request #16 from EmilSayahi/nightly

Merge pull request #15 from EmilSayahi/master