clean up
Merge branch 'master' of https://github.com/tcew/ATPESC14