InDev-0.2 Code Review

Added this pull request to allow a code review of the InDev-0.2 release.