Feature/fchange 2

pull request: Changes from fchange-2