Added line_buffering and stackheap entries
Merge branch 'master' of github.com:jmrosinski/test