Added modal support closes #3