Sep 15 update
Merge pull request #92 from johannesl/master

Sep 15 update of ElksInbox