significant improvements for version 0.4