[FIX] fixed #509
[FIX] fixed #519
Merge pull request #581 from weese/hotfix/trac-tickets

[FIX] fixed Hotfix/trac tickets