fix issue #610
improve documentation (issue: #621)
merge PR #624
fix issue #625
merge PR #626
merge PR #630
merge PR #633
fix issue #634
fix issue #614