Solve 2014-03-06
Improve function naming slightly