works for 28082014
Merge branch 'master' of github.com:victornwong/rws_d