Adding optional re-entry
refactor
Merge pull request #3 from kerinin/rm/optional-reentry

Adding optional re-entry