Fix for #97 - backport from develop
Merge pull request #99 from maksimov/2013.07

Fix for #97 - backport from develop