Hotfix

For http://dev.withsix.com/issues/74491
Hotfix

For http://dev.withsix.com/issues/74491
- tested & working
Merge pull request #140 from micovery/dev

Dev