Fixed some code replications
Merge branch 'master' of https://github.com/ging/lynckia