Some new stuff, version 0.0.2 SNAPSHOT now!