fixes for issue #7 and issue #8

Fixes for issue #7 and issue #8 + cleaned up the README a bit.