Merge pull request #24 from quarterto/master

Master
Merge branch 'develop' of github.com:quarterto/Elessar into develop
Merge pull request #25 from quarterto/develop

srnt