Add META file
Add initial timeout support
Merge branch 'feature-add-initial-timeout-support'