Merge pull request #4 from NotTheUsual/master

Passed 14 test. Added tests for 50... AND 40
Passed test for 40 and 50 Refactored
Added test for 90
Passed the 90 test
Added test for 149