Fixed Google Code Issue 46

https://code.google.com/p/tdmaker/issues/detail?id=46
Fixed Google Code Issue 10