Added constructor wrap and many other fixes
0.6.0