Merge pull request #27 from FlaminSarge/master

EOTL stuffs
Merge remote-tracking branch 'upstream/master'