Beta 0.4

A lot has been added, and even more has been fixed. Hurrah!