Merge pull request #2 from hasadna/master

merge from hasadna
Merge pull request #14 from shakhal/master

Merge pull request #2 from hasadna/master