Various minor code improvement and implementation for issue #35 #36 and #37

Created originally on Bitbucket by marmoute (Pierre-Yves David)

Was already merged in Bitbucket before import, marked as merged by the import user

updated the flag name (s/freezed/frozen/)