Merge pull request #48 from aberigle/modal-fix

Modal fix