Merge pull request #96 from commit-0/modal-update

Merge pull request #96 from commit-0/modal-update #317