Add functionality
Merge pull request #6 from lol768/master

Add functionality