Sent another PR with 'includeme' modifications. Check #232 .