added updates to buffer
Merge branch 'master' of github.com:5inister/cdl-skyline

conflict with diego