added title, made cosmetic changes
removed prompts
resolved conflicts
Merge pull request #24 from ajstanley/7.x

7.x