Improve test
Update copyright year to 2013
Merge branch 'master' of https://github.com/aidGer/aidGer