Add flexibility
Merge pull request #13 from yoksel/master

Add flexibility