done issue #85
done issue #71
Merge pull request #88 from Gr1N/master

work on issue #61
done issue #83; work on issue #89