Bugfix: An empty else clause caused script to fail.
Merge master branch