fixed typo
updated error message
added Energy and Power converter
added tests, updated README
Merge pull request #1 from schmunk42/master

added Energy and Power converter with Tests