Midnight Commit

Signed-off-by: Nikolai Jivkov <nikolaijivkov@gmail>