Revert "Revert "Feature/bug fixes""

Reverts stakes/Frameless#5