dotenv next step
Merge branch 'master' into 59-dotenv
fixes
#59 dotenv support + application structure changes