Merge pull request #20 from leliel12/master

1 fix and a lots of improves
Merge pull request #21 from leliel12/master

added missing files
make core changes for modularity
Merge branch 'master' of https://github.com/mgaitan/waliki