Merge branch 'master' into develop
convert to XCTests
added some test cases
updated README.md
Merge branch 'develop'
updated podspec