minor refactoring
minor refactoring
Merge branch 'master' of github.com:dtouch3d/pairename

TODO added