what we have now, still not working as intended
Merge pull request #48 from dlazell/mybranch

what we have now, still not working as intended