Merge pull request #14 from financeCoding/master

Fix the naming collision