for merge
Merge branch 'master' of github.com:timbitz/aligater
ractip sub in devel