Development

Bug fixes for isses #49 and #50 .