Merge pull request #7 from damjanek/master

Adding couple more features to formula