refactored
Merge branch 'master' of github.com:sndrtj/wisecondor