Fixed bug
Merge branch 'bonesmerge' into dev