merge this in
missing files
resolve conflict
Merge pull request #1 from ashwin2979/tweaks

Tweaks