Merge pull request #57 from msuhanov/master

Some updates (as we discussed before)
restored memset