clean up
Merge pull request #1 from marinamarina/dev

clean up