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

Development.patrick