Skip to content
Couple of bug/state handling fixes

- Resolves #2
- Resolves #4