completes step 2
Merge pull request #2 from markableidinger/step2

completes step 2