moved code
Merge pull request #1307 from spechub/wibble

moved code