Merge pull request #287 from snieguu/devel

Fix for http://jira/browse/TD-177