Pbody into master

A bunch of changes. 
Close #12 
Close #38