changes
Merge branch 'master' of github.com:hendychua/csquare
changes