Merging Stephen's changes (make file executable, use spaces instead of tabs)