Merge pull request #13 from felixcheng/felix-2

Add Services & others
bug fix