- more verbose error messages
- simplification
- cleaner code
Merge pull request #70 from aschnell/master

- minor improvements