clean copy
Merge pull request #1 from sixaces/develop

moving changes