Merge pull request #98 from tiwanek/notification_window