updates
Merge branch 'developer' of https://github.com/shogun42/personal_projects into developer