fixed a merge issue. up to date with master now