Adding in functionality
merge fix
Merge pull request #1 from cpaika/New

Adding in functionality