Lots of changes
v. 0.4.0