Move custom directives on top
Merge branch 'release/0.1.3'