Merge pinoss fork with master repository