Merge pull request #4 from zaherhammoud/master

Provided a code fix for Issue #3 (Boundary issue with the RepeatDirective). Fix #3, Fix #4
Code Change to allow the use of custom directives