Temporary regression
Code optimizations
Fix #25