#15, 26
Merge remote-tracking branch 'origin/dev' into michael
minor bugfixes, short toast
Merge remote-tracking branch 'origin/dev' into michael