Revert "developing some stuff"

This reverts commit cebd3e177cd379d7c3cdb6dc9152bc9b3f1d8a02.
Merge branch 'develop' of https://github.com/smartbrother/ffl into develop