missing includes fix, again..
Merge branch 'master' of https://github.com/lonski/amarlon