Fixes & New Features 

Build source code for the commit Please refer to #6