Update to 0.3.3

Combine two engines
Fix bugs
Remove debug code