Merge pull request #13 from buren/feature3

Feature3
Merge branch 'master' of github.com:buren/test into feature3

Merge.