fixed #12, fixed #26, fixed #25
Merge branch 'master' of github.com:pedectrian/podarkoy