#6 && #8
Merge branch 'master' of https://github.com/mihaistoie/sikia