Issue 18 adamrp

Just pushing a couple tests so that @ElDeveloper and @antgonza have something to test Travis with