commit to save
merge with master
Commit to save

added stringbuffer
added new exceptions
merge with StringBuffer