.36 fix
Merge pull request #7 from mrSkortch/development

.36 fix