Merge pull request #7 from janm399/master

Main app