Make sure not to include STD
Implement #19