Changed by DDJJ 20.08.2013
Added again
Merge pull request #4 from ddjj/master

pull in my branch 4