no important changes
no change
whatever
fixing bigrams
fixed conflicts
Merge pull request #14 from olykos/master

Fixed bigrams + minor changes