removed redundancy
Merge branch 'dev' of gandalf:marked into dev