A feature added to TODO list do be done as soon as possible
Merge branch 'master' of github.com:Yellowen/Faalis