fixing some bugs
Merge branch 'master' of github.com:AlexeyProskuryakov/sn_retriever