gcc.4.8.0 test
Merge branch 'develop'
Merge branch 'develop'
fixed bug in buffer
Merge branch 'master' into develop