cleaning up
Merge branch 'developer'