Merge pull request #74 from kariminf/master

changes before version 1.0