Merge pull request #24 from tcew/night

Night