Added custom annotation test
Fixed special case when using custom annotations and strict
Started working on 3.6.4