Merge pull request #66 from amir20/master

Prepares for next release.