Issue #11
Issue #12
Merge pull request #12 from tomhalstead/Branch-2

2 Issues