initial commit
Merged the online repo version with my first commit locally.

Merge https://github.com/fboehm/research2013