filetype bug fix:
merged master changes