Merge pull request #16 from EmilSayahi/nightly

Merge pull request #15 from EmilSayahi/master
Merge pull request #17 from EmilSayahi/nightly

Moved Files to Extra Folder (Idea from MD repo)
Merge pull request #18 from EmilSayahi/master

Merge with Master