Merge pinoss fork with master