Added new methods for testing
Merge branch 'test' of github.com:schahriar/herb