Beta0.4

Merges all code from beta0.32