Closing branch, Issue 138 and a few other issues fixed.