bug fixes
sa;dlfjk
Merge pull request #21 from morganwallace/morgan

Morgan