fixed issues #22 and #23
Merge branch 'master' of github.com:pairide/pairide