Merge from master

LifePointe 0.9.5