Fixes #5 - exit status of script is honoured (pretty important!)
Merge remote-tracking branch 'origin/master'