Build code => Fixes & New Features 

Build source code for #6 request