M1 - Closing Issue #2

Merging updates due the closing of #2.