Lots of changes
release 0.0.3