Merge pull request #1 from slychika/master

fixed some stuff
Merge pull request #2 from slychika/master

note :)
Merge pull request #3 from slychika/master

The update on our paper
Merge pull request #4 from slychika/master

miwi update
worked on paper
Merge pull request #4 from caitlinhickey/master

worked on paper