Merge pull request #1 from Courseplay/FS15

Fs15 updates