Added w_k variable, made w_s, w_k variables binary
Merge remote-tracking branch 'origin/master'