Minor fixes
Merge branch 'master' of github.com:meteor-falls/Scripts