Merge pull request #47 from hasadna/master

Merge of master into vagrant
Merge remote-tracking branch 'upstream/vagrant' into vagrant