Improved code processing
Version 1.0.0-rc2