Updated to have Windsor sample
Fixed missing using
Merge remote-tracking branch 'dave/dev' into dev