should work now, almost ready for 0.3