Updated and merged latest changes