Added blank line support + fix Wyld's issue