master
Small changes and Windows directory is part of our deliverable now