Fixes and add ops - fix #39
0.4.8