Merge branch 'ms3' of github.com:arashb/POS into ms3