closes #14
Merge branch 'master' of https://github.com/ianderse/clone_wars
additional fixes on wholesale