fixed #109
Merge branch 'bug/109-nas-butler-crs-problem' into dev