bug fix - buffer overflow
Merge branch 'master' of https://github.com/hannuvisti/forge