addded new feature
Merge pull request #1 from zoetrope86/feature1

Added new feature