Merge pull request #181 from am11/master

Option: Pass function as a formatter
Moved LICENSE file to reflect standard