Franks dev

merging to master