Merge pull request #123 from ipa-fxm/lookat

Lookat
Merge pull request #126 from ipa-fxm/lookat

Harmonizing and beautifying