Merge pull request #66 from mbeall/master

LifePointe 0.9.5
Merge pull request #10 from starverte/master

Merge from master