master #16

Merged
asmeron merged 3 commits from :master into master 3 years ago