fixes for all and future
Merge pull request #8 from Homestyle/develop

fixes for all and future