Make file improvements, added repo and pre require modules
Merge branch 'version-0.6'