Issue 77 part 4.

Done.
Merge pull request #224 from CynicRus/master

Issue 77 part 4.