feature 3
Merge pull request #2 from metachris/feature3

feature 3