merging october branch with master