Minor updates
Merge remote-tracking branch 'origin/master' into night
[Travis] Added my e-mail
Merge pull request #27 from tcew/night

Night