Merge develop into master
Merge develop into master
Merge develop into master
Merge develop into master
Merge develop into master
Merge develop into master
Merge develop into master
Merge develop into master
Merge develop into master
Merge develop into master
Merge develop into master
Merge develop into master
Merge develop into master
Merge develop into master
Merge develop into master
Merge develop into master
Merge develop into master
Merge develop into master
Merge pull request #89 from sasarky/develop

a
Merge pull request #90 from sasarky/develop

hage