Squashed all improvement commits into a single commit
Merge pull request #1 from gbockus/gbockus/improved2

Squashed all improvement commits into a single commit