Merge branch 'devin/issues/54' of github.com:dhoss/Kodiak into
devin/issues/54. This also closes #61
Merge branch 'devin/issues/54' of github.com:dhoss/Kodiak into devin/issues/54