various improvements
version 0.4.0