Merge pull request #12 from AMG-Intro/Development.Patrick

Fixing