Merge pull request #135 from benschwarz/feature/modals