Added new features
Merge pull request #2 from jaytaph/feature-001

Added new features