cleanup
Merge pull request #1 from kordano/develop

cleanup