Clean up project. Add better documentation.
Merge branch 'temp'