Develop

Improvements for pull #34 and fixes for pull #36.