initial commit
Merge branch 'master' of https://github.com/wStockhausen/tcsam2013
fixed some errors.