GitHub #163: More work on waf script