[v0.7.2] Fixed bugs.

- Addressed: https://github.com/LeTotalKiller/wawse/issues/7
- Partially addressed (see comments):
https://github.com/LeTotalKiller/wawse/issues/9