Merge pull request #3 from CY-Chan/master

Update EM
Check code. Add estimatePrimitives module
Merge pull request #12 from mattybeam/master

Check code. Add estimatePrimitives module