Fixing small bugs
Merge remote-tracking branch 'github/master'
Added activation on first use and fixed some bugs