Version 0.4

Improvements