Merge
Remove .inc extension
Update samples