bug fixes in code minor document changes
updating but we might have conflicts.

Merge branch 'master' of https://github.com/mkness/Apogee