Issue 77, part 3
Merge pull request #215 from CynicRus/master

Issue 77, part 3