Changed paths in features
Merge branch 'james'