Revert "Merging fork into master"

Reverts tbesiktasli/fablife#1