small bug fixes
Merge pull request #449 from shutter111/development

small bug fixes