Merge pull request #20 from tcew/night

Night