Added some code to WordStreamer.main based on Oscar's suggestions