prepare for freeze
Merge pull request #608 from shackbarth/check

prepare for freeze