Fixed installer to work with service stack
Merge remote-tracking branch 'origin'