solution 1
Merge pull request #4 from xizzles/master

Merge pull request #2 from ellMathur/master
Merge pull request #3 from ellMathur/master

solution