Issues 6 & 10

* Previous commits caused a tag mismatch on conditional
  - Fixed issue 10
  - Issue 6 remains unresolved