Merge pull request #7 from dumganhar/iss1686-synchronize

fix for conflict of project.pbxproj and updated with upstream.