Merge pull request #15 from EmilSayahi/master

Updated nightly branch to sync with Master branch.