Merge pull request #570 from timothycrosley/feature/fix-issue-566

Feature/fix issue 566