Enhancing the love.
Merge pull request #13 from fskirschbaum/master

Enhancing the love.