Updated to 0.4.0

Also re-implemented the "Work-around for superfluous brackets" (cba23a28c36273ed11e53bea5c66e6f7f33ed4ea)