clean up source code indentation
modified makefile to link with archive libraries
Merge branch 'release-0.2' into develop