Merge pull request #1 from jordanatlas/master

Getting jordan's changes.
Merge pull request #2 from anikiforova/master

Merge pull request #1 from jordanatlas/master