Added improvement from ISSUE-9. Updated to the latest build tools