a bunch of new features; to be documented
Merge branch 'master' of https://github.com/r-lyeh/heal into upcoming
a bunch of new features; to be documented
Merge branch 'master' of https://github.com/r-lyeh/heal into upcoming

Conflicts:
	heal.cpp
	heal.hpp
	sample.cc