Added sys.exit msg
Merge branch 'master' of http://github.com/mekarpeles/waltz