Merge branch 'xavier_master'
Oops, beam files should not be committed
dependencies updated
Merge pull request #2 from leikind/master

A few minor fixes