marked legacy methods deprecated, updated docs
corrected method names, fix bug FS#69
Merge branch 'develop' into conservation