Several bugs fixed + style added
Merge remote-tracking branch 'origin/master'
Added licence