Merge pull request #3 from odedshr/v0.2

trying to commit into master (I think I got it)