Move to 4.0 framework

#25