Added #! support