A couple new features added.
Merge branch 'feature-idea'
New feature (in master branch) for testing conflict.