Little refactoring and bugs fixed
Merge branch 'master' of https://github.com/weaondara/sw14_free_30.git