Merge pull request #318 from infrastation/develop

some improvements for develop branch