#11: Edge case scenarios fixed
Merge pull request #13 from mchannon/11

#11: Edge case scenarios fixed