synching code
Merge pull request #18 from karma-exchange-org/codesynch

synching code