Merge pull request #17 from tcew/night

Night
Merge pull request #18 from tcew/night

Night
Merge pull request #19 from tcew/night

Night