Partially working
Normal cases passing
Working
Merge pull request #1 from KoryNunn/master

first cut