Revert "Revert "quick commit 2014-07-04 14:57:04""

This reverts commit 21eece2ce3db6a6472d29160399d672308a73c64.

that was not what I intended to do...